Update external/wpt/webrtc/RTCRtpParameters* tests. This is in preparation for get/setParameters[1] and RTCRtpTransceiver[2]. Tests are updated to use promise_test and async/await to make them easier to write and to execute sequentially. Tests are updated to set up a call before getParameters() because many parameters are defined as "that has been negotiated". If we want to test what is returned before negotiation we should add that as separate tests. For now, this is necessary for the tests to run on [1][2]. Some tests are removed because they no longer reflect the spec. Because get/setParameters() and RTCRtpTransceiver has not landed yet, the tests are still expected to fail. [1] https://chromium-review.googlesource.com/c/chromium/src/+/1102436 [2] https://chromium-review.googlesource.com/c/chromium/src/+/1025771 Bug: 803494, 777617 Change-Id: I3f14a37925837576a602d91bb67e48181c56a946 Reviewed-on: https://chromium-review.googlesource.com/1102502 Reviewed-by: Harald Alvestrand <hta@chromium.org> Commit-Queue: Henrik Boström <hbos@chromium.org> Cr-Commit-Position: refs/heads/master@{#571430} diff --git a/webrtc/RTCRtpParameters-encodings.html b/webrtc/RTCRtpParameters-encodings.html index 00c2f47..b4a60c8 100644 --- a/webrtc/RTCRtpParameters-encodings.html +++ b/webrtc/RTCRtpParameters-encodings.html
@@ -12,6 +12,7 @@ // https://w3c.github.io/webrtc-pc/archives/20170605/webrtc.html // The following helper functions are called from RTCRtpParameters-helper.js: + // doOfferAnswerExchange // validateSenderRtpParameters /* @@ -114,9 +115,12 @@ Otherwise, set it to a list containing a single RTCRtpEncodingParameters with active set to true. */ - test(() => { + promise_test(async t => { const pc = new RTCPeerConnection(); + t.add_cleanup(() => pc.close()); const transceiver = pc.addTransceiver('audio'); + await doOfferAnswerExchange(t, pc); + const param = transceiver.sender.getParameters(); validateSenderRtpParameters(param); const { encodings } = param; @@ -125,9 +129,11 @@ assert_equals(encoding.active, true); }, 'addTransceiver() with undefined sendEncodings should have default encoding parameter with active set to true'); - test(() => { + promise_test(async t => { const pc = new RTCPeerConnection(); + t.add_cleanup(() => pc.close()); const transceiver = pc.addTransceiver('audio', { sendEncodings: [] }); + await doOfferAnswerExchange(t, pc); const param = transceiver.sender.getParameters(); validateSenderRtpParameters(param); @@ -151,8 +157,9 @@ 5.2. getParameters - encodings is set to the value of the [[send encodings]] internal slot. */ - test(() => { + promise_test(async t => { const pc = new RTCPeerConnection(); + t.add_cleanup(() => pc.close()); const { sender } = pc.addTransceiver('audio', { sendEncodings: [{ dtx: 'enabled', @@ -164,6 +171,7 @@ rid: 'foo' }] }); + await doOfferAnswerExchange(t, pc); const param = sender.getParameters(); validateSenderRtpParameters(param); @@ -190,10 +198,12 @@ with a newly created InvalidModificationError. Note that this also applies to transactionId. */ - promise_test(t => { + promise_test(async t => { const pc = new RTCPeerConnection(); t.add_cleanup(() => pc.close()); const { sender } = pc.addTransceiver('audio'); + await doOfferAnswerExchange(t, pc); + const param = sender.getParameters(); validateSenderRtpParameters(param); @@ -208,10 +218,12 @@ sender.setParameters(param)); }, `sender.setParameters() with mismatch number of encodings should reject with InvalidModificationError`); - promise_test(t => { + promise_test(async t => { const pc = new RTCPeerConnection(); t.add_cleanup(() => pc.close()); const { sender } = pc.addTransceiver('audio'); + await doOfferAnswerExchange(t, pc); + const param = sender.getParameters(); validateSenderRtpParameters(param); @@ -221,32 +233,11 @@ sender.setParameters(param)); }, `sender.setParameters() with encodings unset should reject with InvalidModificationError`); - promise_test(t => { + promise_test(async t => { const pc = new RTCPeerConnection(); t.add_cleanup(() => pc.close()); const { sender } = pc.addTransceiver('audio'); - - const param = sender.getParameters(); - validateSenderRtpParameters(param); - const encoding = getFirstEncoding(param); - const { ssrc } = encoding; - - // ssrc may not be set since it is optional - if(ssrc === undefined) { - encoding.ssrc = 2; - } else { - // If it is set, increase the number by 1 to make it different from original - encoding.ssrc = ssrc + 1; - } - - return promise_rejects(t, 'InvalidModificationError', - sender.setParameters(param)); - }, `setParameters() with modified encoding.ssrc field should reject with InvalidModificationError`); - - promise_test(t => { - const pc = new RTCPeerConnection(); - t.add_cleanup(() => pc.close()); - const { sender } = pc.addTransceiver('audio'); + await doOfferAnswerExchange(t, pc); const param = sender.getParameters(); validateSenderRtpParameters(param); @@ -265,34 +256,13 @@ sender.setParameters(param)); }, `setParameters() with modified encoding.rtx field should reject with InvalidModificationError`); - promise_test(t => { - const pc = new RTCPeerConnection(); - t.add_cleanup(() => pc.close()); - const { sender } = pc.addTransceiver('audio'); - - const param = sender.getParameters(); - validateSenderRtpParameters(param); - const encoding = getFirstEncoding(param); - const { fec } = encoding; - - if(fec === undefined) { - encoding.fec = { ssrc: 2 }; - } else if(fec.ssrc === undefined) { - fec.ssrc = 2; - } else { - fec.ssrc += 1; - } - - return promise_rejects(t, 'InvalidModificationError', - sender.setParameters(param)); - }, `setParameters() with modified encoding.fec field should reject with InvalidModificationError`); - - promise_test(t => { + promise_test(async t => { const pc = new RTCPeerConnection(); t.add_cleanup(() => pc.close()); const { sender } = pc.addTransceiver('audio', { sendEncodings: [{ rid: 'foo' }], }); + await doOfferAnswerExchange(t, pc); const param = sender.getParameters(); validateSenderRtpParameters(param); @@ -311,10 +281,11 @@ value less than 1.0, abort these steps and return a promise rejected with a newly created RangeError. */ - promise_test(t => { + promise_test(async t => { const pc = new RTCPeerConnection(); t.add_cleanup(() => pc.close()); const { sender } = pc.addTransceiver('audio'); + await doOfferAnswerExchange(t, pc); const param = sender.getParameters(); validateSenderRtpParameters(param); @@ -325,10 +296,11 @@ sender.setParameters(param)); }, `setParameters() with encoding.scaleResolutionDownBy field set to less than 1.0 should reject with RangeError`); - promise_test(t => { + promise_test(async t => { const pc = new RTCPeerConnection(); t.add_cleanup(() => pc.close()); const { sender } = pc.addTransceiver('audio'); + await doOfferAnswerExchange(t, pc); const param = sender.getParameters(); validateSenderRtpParameters(param); @@ -346,52 +318,76 @@ }, `setParameters() with encoding.scaleResolutionDownBy field set to greater than 1.0 should succeed`); // Helper function to test that modifying an encoding field should succeed - function test_modified_encoding(field, value1, value2, desc) { - promise_test(t => { + function test_modified_encoding(kind, field, value1, value2, desc) { + promise_test(async t => { const pc = new RTCPeerConnection(); t.add_cleanup(() => pc.close()); - const { sender } = pc.addTransceiver('audio', { + const { sender } = pc.addTransceiver(kind, { sendEncodings: [{ [field]: value1 }] }); + await doOfferAnswerExchange(t, pc); - const param = sender.getParameters(); - validateSenderRtpParameters(param); - const encoding = getFirstEncoding(param); + const param1 = sender.getParameters(); + validateSenderRtpParameters(param1); + const encoding1 = getFirstEncoding(param1); - assert_equals(encoding[field], value1); - encoding[field] = value2; + assert_equals(encoding1[field], value1); + encoding1[field] = value2; - return sender.setParameters(param) - .then(() => { - const param = sender.getParameters(); - validateSenderRtpParameters(param); - const encoding = getFirstEncoding(param); - assert_equals(encoding[field], value2); - }); - }, desc); + await sender.setParameters(param1); + const param2 = sender.getParameters(); + validateSenderRtpParameters(param2); + const encoding2 = getFirstEncoding(param2); + assert_equals(encoding2[field], value2); + }, desc + ' with RTCRtpTransceiverInit'); + + promise_test(async t => { + const pc = new RTCPeerConnection(); + t.add_cleanup(() => pc.close()); + const { sender } = pc.addTransceiver(kind); + await doOfferAnswerExchange(t, pc); + + const initParam = sender.getParameters(); + validateSenderRtpParameters(initParam); + initParam.encodings[0][field] = value1; + await sender.setParameters(initParam); + + const param1 = sender.getParameters(); + validateSenderRtpParameters(param1); + const encoding1 = getFirstEncoding(param1); + + assert_equals(encoding1[field], value1); + encoding1[field] = value2; + + await sender.setParameters(param1); + const param2 = sender.getParameters(); + validateSenderRtpParameters(param2); + const encoding2 = getFirstEncoding(param2); + assert_equals(encoding2[field], value2); + }, desc + ' without RTCRtpTransceiverInit'); } - test_modified_encoding('dtx', 'enabled', 'disabled', + test_modified_encoding('audio', 'dtx', 'enabled', 'disabled', 'setParameters() with modified encoding.dtx should succeed'); - test_modified_encoding('dtx', 'enabled', undefined, + test_modified_encoding('audio', 'dtx', 'enabled', undefined, 'setParameters() with unset encoding.dtx should succeed'); - test_modified_encoding('active', true, false, + test_modified_encoding('audio', 'active', false, true, 'setParameters() with modified encoding.active should succeed'); - test_modified_encoding('priority', 'very-low', 'high', + test_modified_encoding('audio', 'priority', 'very-low', 'high', 'setParameters() with modified encoding.priority should succeed'); - test_modified_encoding('ptime', 2, 4, + test_modified_encoding('audio', 'ptime', 2, 4, 'setParameters() with modified encoding.ptime should succeed'); - test_modified_encoding('maxBitrate', 2, 4, + test_modified_encoding('audio', 'maxBitrate', 10000, 20000, 'setParameters() with modified encoding.maxBitrate should succeed'); - test_modified_encoding('maxBitrate', 24, 16, + test_modified_encoding('video', 'maxFramerate', 24, 16, 'setParameters() with modified encoding.maxFramerate should succeed'); </script> 